d/rules: Update Meson options, mostly removing enable- prefix

diff --git a/debian/changelog b/debian/changelog
index 3b25499054cc12ced5a6d05e0ba6f36aab74a7b9..ad776c28f4ad4cc86dc5436c1d77acfda3c2b95a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -43,6 +43,7 @@ gtk+4.0 (3.94.0-1) UNRELEASED; urgency=medium
     modules such as XIM and Wayland are now linked into GTK+ itself,
     while non-backend IM modules have been removed.
   * Remove obsolete debian/*.install files from GTK+ 3
+  * d/rules: Update Meson options, mostly removing enable- prefix
 
  -- Jeremy Bicha <jbicha@debian.org>  Fri, 19 Jan 2018 22:05:35 -0500
 

diff --git a/debian/rules b/debian/rules
index 51fc653ff30e9337753892828dbf6f9545103669..953e9bd31f2bd4089a4a9a82ff436a6b714eff4f 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -89,29 +89,28 @@ debian/%: debian/%.in
 
 configure_flags_common = \
        --libdir=/$(LIBDIR) \
-       --libexecdir=/usr/libexec \
-       -Denable-test-print-backend=yes
+       --libexecdir=/usr/libexec
 
 configure_flags_deb = \
-       -Denable-broadway-backend=true \
-       -Denable-x11-backend=true \
+       -Dbroadway-backend=true \
+       -Dx11-backend=true \
        -Ddocumentation=true \
        -Dman-pages=true \
        -Dintrospection=true \
        -Dinstall-tests=true \
-       -Denable-cloudprint-print-backend=yes \
+       -Dcloudprint=yes \
        -Dmedia=none
 
 ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
-configure_flags_deb += -Denable-colord=yes
+configure_flags_deb += -Dcolord=yes
 else
-configure_flags_deb += -Denable-colord=no
+configure_flags_deb += -Dcolord=no
 endif
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
-configure_flags_deb += -Denable-wayland-backend=true
+configure_flags_deb += -Dwayland-backend=true
 else
-configure_flags_deb += -Denable-wayland-backend=true
+configure_flags_deb += -Dwayland-backend=true
 endif
 
 ifeq ($(filter %-doc,$(binaries)),)
@@ -119,11 +118,11 @@ configure_flags_deb += -Ddocumentation=no -Dman-pages=no
 endif
 
 configure_flags_udeb = \
-       -Denable-broadway-backend=false \
-       -Denable-wayland-backend=false \
-       -Denable-x11-backend=true \
+       -Dbroadway-backend=false \
+       -Dwayland-backend=false \
+       -Dx11-backend=true \
        -Dintrospection=true \
-       -Denable-cloudprint-print-backend=no \
+       -Dcloudprint=no \
        -Dcolord=no \
        -Dmedia=none